task: #3587707 Try to avoid extra cache sets/gets in ThemeRegistry

By: catch (cherry picked from commit 9972cbae)

Closes #3587707

Merge request reports

Loading