@fancy-queen-20734 : one concrete question for you (can respond on the PR if you want): how should i handle the

Snapshot

and

FilesContent

hacks i have in place here: https://github.com/pantsbuild/pants/pull/4265/files#diff-11db197014e1e80c9551e9b61aba6aa0R409