Updates to scripts to use caching