Fix #312 - Make caching keys based on the original name of the thumbnail...

..., not the storage's name which can add _1, _2, _3, etc.