Cache and search fixes
Use etag for caching