While I don't consider this idea, I like it much better than having the circular dependancies. This should fix the bug I caused the other day by removing Thread Local. PR: Obtained from: Submitted by: Reviewed by: