CAR-1442 to master

This is the cherry-pick of the read caching commits to the master branch.