Added local image caching