Patched version of image cache