Refactored + got route caching to work, finally.