Use Thread.current instead class variables