Update to cache remote images & new cache nameing