rebase on master
remove option to only query cache