Remove usage of Thread-Local for performance reasons