Delay the runtime graph walk until the last minute
- Cache it as well

#1011