Added caching of images