Scheduler and cache added