Fixing cache issue on querying all / first with same selector
Merge branch 'fix/query-cache'