Removed caching framework calls