Merge pull request #473 from negativeExponent/chd_image_cache