Moving cache to its own object
Updating version