Wip sip23 √

Re: leaks – you mean by accidentally keeping a reference alive in a
ThreadLocal?

Re: better map and keys – yes, agreed.