[BUGFIX] Fix cache issue with theme implementation