Maybe we should have it extend  ThreadLocal and override all methods so it can be used as "drop-in" replacement ?