Support arbitrary number of teams, cleaned up code, broke --test, added cache flag