caching fixes cont