Added app name to cache keys to prevent collisions