Added dep status caching and some other things