Improved caching support