Refactored DAOs to be cachable