Use a separate lock for the subscriber stuff
Test for ChangeRequiresRestart