Moved the per collection etag code to post-write