fixes to default caching