Merge pull request #2063 from atsign-foundation/gkc-fix-2032-collection-cached-keys