BZ-9549: underscore corrections

Signed-off-by: Paden <padenportillo@gmail.com>
BZ-9549: cache underscore

Signed-off-by: Paden <padenportillo@gmail.com>