Finished migrating dao calls to cache api