Ok. I'm still of the idea that it should be possible to emulate what the Weak map does, without leaking WeakReferences (after all, you can pass a ``ReferenceQueue`` to a WeakReference). Anyway, **if you think there is no risk of deadlock**, then we are only discussing performances, and your patch is already improving the status quo considerably, so it's absolutely fine as it is.