CacheAndCheckpoint rewritten