Try and fix TS on caching pages