Merge "Avoid using the deprecated ParserCache::singleton()"