Proposed changes for NH-3579

Store in query cache only parts of the plan that required for
plan reconstruction