and fix a bug in ScDPCache::ValidQuery where an inner loop
was re-using an outer loop counter.

Change-Id: Ie750234a079646bdb7174983814d8d9caf52f491