Fix some more lingering issues from migrating to DonorCache