Added image caching