Merge "Use consistent caching strategy in Revision storage classes"