Really janky cache fix

We'll probably have to revert these auto-escapes and do it better