Add full backport Routing Cache