Started to add dependencies and caching