Make CSS cache depend on browser.

@bug W-xxxx@

@rev byao@
Merging origin/goliver/master-pending-fix-css-cache into master