Change Javadoc of Cache and Generic.
Conflict resolution.