Working on image caching
Merge