SiteImagesCache improvements and fixes

Resolves issues #2 and #3