(maint) Remove TODO comment
Merge remote-tracking branch 'hlindberg/pup-1699_cache-environments' into pup-1699_cache-environments
(maint) Update defined_types benchmark to ensure correct environment