Change mapping cache to mutable dictionary, allow externally setting mapping
Import for non-relationship objects, fix date formatting in importer
Move singleton accessor to base class