Removing caching

Remove caching