Update to Image Cache for tests
Merge pull request #336 from mhotan/phase_4_dev

Update to Image Cache for tests