Add option methods
Make etag configurable

Also restrict when we generate etag.