Fix Expires when the header is -1
Improved backwards compatibility