I saw you reverted the resourceVersion solution. I have a fix for the race, though it does not do it "the right way" by watching resourceVersion. I can submit it if you think it is helpful as a temporary fix. There are a couple small change I will make before submitting, such as removing the paincs.

ericmillin@a523953

@rhuss