#19735523233457 : Refactor to replace the Etag Handle by Interceptors