Ensure we're supporting `find_by!`

[glacials]

In manual testing it appears we work with find_by!, but its source implies we shouldn't be working with it, as it doesn't depend on find_by. We should make sure we are supporting it, and do so in a way that doesn't accidentally cause us to call expand twice.