Fix classes refactored into c.i.j.core.cache instead of imple.cache