Fixes for Etags on files that are cached