Added Header cache support