Little cleanup of the Cache creation code.