Merge "Avoid deprecated LinkCache::singleton()"