thanks a lot for your quick reply.
Thanks a lot for pointing me to section 4.2.4. But as you already wrote the current version of this statement just covers entity providers.
I would be fine with both options as both would fix the problem I mentioned. Although I think the latter one would should be preferred because it is much simpler.