Resurrect cache broken in master