Make extra caching explicit, fix clearing cache