Changes in caching for more modularity in install functions.