fix cache key
Fix GA code