tweak cache key so that amazon and aws-marketplace image sets are shared across accounts