Revert "Removed 'type' from image cache filename"

This reverts commit 74dcebc6d83e70f167e54267a4eb830e9edba5d8.