Sorry, I just overlooked your proposal. I think your proposal using FileSnapshot would solve my specific problem of instable EGit tests much better. I'll review your proposal. We could even abandon this change then, but if I understood you correctly you still need a refresh() method for DHT use cases. For that I would leave this one open.