Move placement of CPThemeStates cache to above the cache method for clarity.