Minor tweaks to the query service API.
Merge branch 'rowcache'