CP-9440: Merge read caching related changes to Master