Merge "Remove dead code from RCCacheEntryFactory"