Rename watchers and callbacks caches