Remove unnecessary new caching