Added headers
Added args cache