Merge "Add support for caching the account list"