Modified default caching behavior