Added caching of snapshot