still working on it, but https://github.com/pantsbuild/pants/pull/4867/files#diff-67d1a5d7d25c37d4236b6b1cf26055dbR108 appears to invalidate the appropriate things to get a bunch more of the tests passing