Reinstate page caching and route fixes