Fix caching for CPS files

Remove two caches that were already no longer used