I would like to remove the ThreadLocal as well.
I will try what you have suggested to see how it looks.