Bit of a refactor to the image cache to make it easier to extend.
Also takes into account the entire image instead of just a cropped portion.