[DS-1898] OAI not always closing contexts