add the 2.6.30 port of the cache workaround patch from #4293 (thx, acoul)