Add better spam header handling; also cache raw headers