Fix escaping for cached content