Enhance caching test