Watcher and cache support paths as keys, indexer queries are reduced to ...

...minimum