Use CacheableDependencyTrait

Closes #3539114

Merge request reports

Loading