Wip sip23 √

@richdougherty Both keeping an instance of a Scala Map in a TL (leak reference to scala-library) and prevent instances from lingering in the map when they are no longer needed.