Added caching for snapshots