Cache checkpoint tweaks