Split hotloading tests up Even safer cache check for delegate substitutions Replace delegates with null if we can't find a valid substitution