GPCACHEEHCACHE-6

These changes should fix the issue that I encountered with JIRA GPCACHEEHCACHE-6.