Self-explanatory name. A few fixes are also included, as well as code clean-up. In particular removing the non-thread-safe caching mechanism for upgrade geometry, as this is not used any more.
FYI: @tstreble @tadej @nstyles @npetters