Invalidate pages when moved
Revert "Another content object cache"

This reverts commit 890e9470fe4fedc058348364f0ed68de7f4bc5f1.

To see how it goes with unit test