Removed image caching to save memory