Fix image caching

- ruben