Move from directory-cache to directory-watch