related to ca186fe58e028f13b11ae7920533dd2e228804d8, use ThreadLocal<T> instead
related to ca186fe58e028f13b11ae7920533dd2e228804d8, use ThreadLocal<T> instead

Also marks static where it was accidentally omitted before.

McSherry/Zener