Revert "Revert to using just the combined_cache for HostVars"

This reverts commit e9229cfeaa7727bfb66642cc553a51f9add81e6d.
Redoing patch for hostvars fix, since the previous one broke other tests