more caching improvements