This issue is blocked by cache updates. Hoping to close that issue and create new approach/epic that will be put into consideration of the team.