Merge "add caching to the AccountManagerService"