Okay so thought - if you go with the Jinni in the Ring/Lamp, his ability to using his powers (or PHENOMENAL COSMIC POWERS) could be limited by wishes. Like, no stopping him from doing small magic spells to maybe defend himself, but BIGGER things? It needs to be cast through a wish whether tricking someone into making the wish or someone just making a wish for him.