Added some things to cache and sheduler