VID-977 Cache less, invalidate more.
VID-977 Fixes from pull request
Merge pull request #1876 from Wikia/VideoSprint36-VID-977

VID-977 Cache less, invalidate more.