Fixed paralleization and caching and a rename.