caching enhancements