Enhance Caching Framework