Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo