Fix cache watchlist