Cache queries, issue 364
Merge, issue 364