Tweaking cache key a bit