refactor InvalidateRoute to be explicit about expression. fix #117