Checkpoint before hacking caches
broad refactoring