Fixing up some more of the image cache