Use session for persistent storage in setup per Issue #888