Caching improvements.