Replaced the duplicate call to the icfg by an access to cached structure we have anyway