Intent to backport OAK-6413 & OAK-6374

[Amit Jain]

Hi,

OAK-6413 - Minor issue with not properly updating cache statistics
OAK-6374 - Minor issue where the actual error thrown gets masked because of
an issue when converting to Map from properties if the value is null or not
string

Thanks
Amit