Merge "Do not immediately send new queries on cache hit"