I think you need to do that with ClusterState & ClusterStateStatus as well otherwise you will see inconsistent state