branchzio/fix/sub-watcher-case-sensitivecancel