In D3720#104951, @karol-bisztyga wrote:

Synchronizing accessing to state is handled in D3800. I decided it would be better to do this as a follow-up because the easiest and the cleanest way of doing it is to implement it in the master class.

It would be more efficient to think about issues like this before putting a diff - we need to spend more time planning and thinking about what we're doing instead of quickly writing a lot of code that has serious issues.
In this case, your decision makes sense, but only because we're in a state that should be avoided.