PmCacheCfg2: Moved deprecated code to separate classes.