Added ETag and Cache-headers support