Route cache is now a csv, and some minor tweaks elsewhere