Reduce calls, tasks and duplicate work (#6964)
### Description
Reduce the number of (cached) function calls, resolve tasks and work in
general.
### Testing Instructions
<!--
Give a quick description of steps to test your changes.
-->
Closes PACK-2207
