Persistent context storage

See this post by Nick...