Modified the caching behavior