Fix etag vary logic. Closes #2163