feat(cache): use cache more often (#8238)

feat(cache): use cache more often (#8238) #6233