The plan was that this would be fixed as a consequence of deploying the new node cache. That would still be true and that is where I am likely to concentrate my efforts. But replacing the node cache is a large project and, although I've done most of the work required for this already, it still takes a surprisingly long time for deployment to actually get done. So, it might be good to fix this specific bug within the old node cache for the short term.