@hverbeet @zfigura. Thanks for the feedback. I've addressed both.
I've added two new commits: 1. adds a test for when the Factory is created single threaded (as that shouldn't block); and 2. added the optimization suggested by @hverbeet
I've also rebased and force pushed (as I removed the CodeWeaver bug references)