Caching fixes