Watcher is not removed from leader cache when done
MB-32716 [BP 5.5.4] Remove watcher from leader cache upon exit
MB-32717 [BP 6.0.1] Remove watcher from leader cache upon exit