Refactoring some code
Added installation from cache framework