HV-637 Avoiding putIfAbsent() calls if cached messages were found; Fixing some typos/formatting issues;