Readd StaticWQKmsCacheKey and use it again. This class was removed under the assumption that it only wrapped the Cache Key but the WQKmsfactory also uses this.