Remove some cache control complexity

We've never used this code, its rotting, and I'm about to tear
apart contribution tracking so I figured some cleaning was in
order.

Change-Id: I2fc18aa3d9a841e159507ed4888e30e176ce6e6f
Merge "Remove some cache control complexity"