Always make sure to clear cached data after unwatch; add a test to confirm this