Reload fixes

WiP fix of [JENKINS-23152](https://issues.jenkins-ci.org/browse/JENKINS-23152). Currently blocks visible bug symptoms, but there is still a memory leak somewhere; not sure if it is relevant.