New cache dir name.
Some minor optimization and bug fixing.