Updated to use the cached version.