More canonicalization plus some cache headers