Swapped ThreadStatic attribute to ThreadLocal<> to see if it improves performance