We don't really need a PersistentDict here. fixes gh-461
Merge branch 'master' into issue_459