Cherry-picked 489b5c1 from multihost_site_cache_fix branch