HV-637 Avoiding putIfAbsent() calls if cached messages were found; Fixin...

...g some typos/formatting issues;