Removed caching support