The query interceptor relies on the return value of the write commands to know the previous value of the modified entries. This is not correct, because some write commands do not return the previous value, e.g. remove(key, value), replace(key, oldValue, newValue), and putAll(map).

The query interceptor should instead look up the previous values in the invocation context, and also force the loading of old values in the invocation context if the command doesn't do it explicitly (e.g. putAll(map), or put(k, v) with the IGNORE_RETURN_VALUES flag).