Moved ETag generation to the correct place