Bug 451363 - Test suite caches wrong shape URI

The test suite caches query shapes when the query and creation factory
URIs are the same. Only cache creation factory shape URIs.

Change-Id: I318867cb2928166abdf37dbd72b9b2bfcd3091f8
Signed-off-by: Samuel Padgett <spadgett@us.ibm.com>