Prevent interference between sites when using multi-host/dynamic site setups
Merge pull request #3234 from damianmoore/multihost_site_cache_fix

Prevent interference between sites when using multi-host/dynamic site setups