Added country another place in cache key gen