Removed usage of CM_CacheConst for modularity