Some caching improvements with Account and Role
Modified persistence