Some renames. Upped the cache size.