Caching improvements