Accessors for groups, with automatic 'upstream' expansion
New cache structure, better upstreams, testing.