We talked about this today and the agreement was to use thread static until we have refactored the container story (like @danielmarbach suggests)