Separated Cache and Annotations to separate packages (BC break!)