The queryflags count as part of the cache key.

2 files changed, 2 insertions, 2 deletions

diff --git a/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java b/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java
index 69113f5e057..1513cf2213c 100644
--- a/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java
+++ b/container-search/src/main/java/com/yahoo/fs4/QueryPacket.java
@@ -125,8 +125,8 @@ public class QueryPacket extends Packet {
         IntegerCompressor.putCompressedPositiveNumber(getHits(), buffer);
         // store the cutoff time in the tag object, and then do a similar Math.max there
         buffer.putInt(Math.max(50, (int)query.getTimeLeft()));
-        buffer.putInt(getFlagInt());
         ignoreableSize = buffer.position() - relativeZero - ignoreableOffset;
+        buffer.putInt(getFlagInt());
         int startOfFieldToSave = buffer.position();
         Item.putString(query.getRanking().getProfile(), buffer);
         queryPacketData.setRankProfile(buffer, startOfFieldToSave);
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
index e81a1ae2864..b35ef0e09cf 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
@@ -50,7 +50,7 @@ public class PacketCacheTestCase extends junit.framework.TestCase {
 
         cache.setMaxCacheItemPercentage(50);
 
-        final int keysz = 32;
+        final int keysz = 36;
 
         // first control assumptions
         assertEquals(keysz, key1.byteSize());