Finished caching additions to ORM