ORM override: init/relationship cache dependency fixes, minor styling changes.
Merge pull request #315 from shadlaws/orm_cache

ORM override: init/relationship cache dependency fixes, minor styling changes.