Ensure that zinc analysis from cache is correctly merged.

This is a probable fix for the missing-class-at-runtime bug.