Fix tracking teardown with cascade