Remove caching
Initial commit of Save class