Minor improvement. ICAP is not overloaded to reduce overhead.