LPS-47627 Construct cache key from both properties
LPS-47627 SF