This doesn't seem right to me.  It seems we should use ```ThreadContext.put()``` only not a get in there first.