CAP-157 Fixes to eTag caching