Remove track from cache when it gets disposed outside of the cache handler (#2157)