Switch to classic analytics
fix key errors with cache