Yeah, I suppose the extra dep might be a pain until we get around to switching to gradle or somesuch.  In the past a simple ThreadLocal has done the trick for me.