Merge pull request #1450 from apache/juerg/cache-query

Make artifact and source cache query explicit