Add headers to indicate where the answer came from
Remove etags
Refactoring of error mappings