image caching improvements