Stop "calculating" for API enrichment

[Joachim_Brindeau]

Thanks for your answer.
Those workarounds are interesting but quite heavy in terms of changes.
I opened a feature request here. Please vote !