Fixed that watch may scan service caches