Rename cache variables
Fix some whitespace problems
Look inside ZIP files