Cache terms differently
Merge pull request #4041 from openscholar/3952-3.8

Cache views filtered by taxonomy correctly