Caching of routing table now works
Changes to run with test harness
Merge