Cache key generator tweaks