Cache Backport (D7 to D6)