@wburns I don't think we handle correctly the scenario in which passivation is disabled. In this case the entries in memory are a subset of the entries on the disk, so I think we should rather use the store instead of the memory for these operations.