Make persistence work with normal sessions