Refactor caching treatment of accounts, to turn code reusable