Tried to fix TwoWayCache - currently misbehaving worse