EZP-22105: updated InMemory storage