Added caching to images