Wasn't there an issue with converting all dicts to `PersistentMapping`?
Was this solved by moving it into the adapter?