Added image caching fixes