issue 1219: Modified query cache to invalidate on row+column