Fixed caching.