Use the same query when testing for cached values

The original test wasn't using the same query, and so wasn't actually
testing if values were being cached. This test is now failing, as values
are still being cached.

Also removed previous test, as it was added in error.