Changing to two local caches, one normal and one snapshot
Merging