better cache keys and slightly improved progress output, fixes #5, fixes #6