Changed name of function and cache to allow migration.