Remove cache-related code introduced by 83da94a .  cf. 8b21886