Branch: ENG-326_account-caching#056f2e1