Fixed incorrect cache key names