If we are talking about the same thing I don’t think your workaround will work. My internal repro was moving a file from BUILD.foo to BUILD.bar invalidated the resolve.