Remove the CurrentPage and CurrentBlock properties from RockBlock and RockPage, and move a lot of the properties/methods from the PageCache/BlockCache objects into the RockPage and RockBlock.