Fix thread-safety in NonDeploymentManagementContext