caching fixes