Merge "Add RCCacheEntryBuilder, split from EnhancedChangesList and cleaned up"