Change routing table dispatcher to cache accounts instead of routing tables
Minor cleanup, use a single line instead of two
Merge branch 'feature/issue-1128-change-routing-table-dispatcher-to-cache-accounts' into develop