Fixed caching definitions