Refactor of ImageCacheSpecification