Fixed caching strategy some more.