I have a quick and easy way for them to put to rest this entire Adam is still in the cage issue, and it would be canon friendly
In 10.09 The Things We Left Behind, Castiel told Claire
No. The human soul, it can only occupy a body while it retains a certain … structural integrity, and this vessel, it was … It was ripped apart on a subatomic level by an archangel.
In 5.22 Swan Song, Castiel threw a Molotov cocktail of holy oil at Michael while he was wearing Adam as a meatsuit. Would a holy oil Molotov cocktail have the same affect on the meatsuit an archangel is wearing? And, if that were the case, Adam's soul would no longer be occupying his vessel.