Is this going to make the thread-safety issues with this class worse?