so i'm gonna wait a bit and reread my diffs before pushing next time because pants master is now extremely chatty about cache invalidation, this is a ~20 line fix https://github.com/pantsbuild/pants/pull/5233