Instead of performing a redundant query, just wrap the result