modified team_cache