I could go either way, so whichever leads to a more readable spec I suppose :)

The significant changes in my mind are to move some of the logic moved out of the dea_client and, if practical, to avoid the indirection of placing a value in a hash only to have to almost immediately retrieved.