Remove repeated code. Make sure to always set the etag with a value (currently there is a case which is left null)
Fix: return NotModified instead of NotFound