Cache mechanism improved.