A couple tweaks to the cache builder