Refactorings and data-race fixes for the standard PageCache
Merge pull request #2463 from chrisvest/2.2-future

Refactorings and data-race fixes for the standard PageCache