Fixed bug where cache was added twice to mesasge resulting in an unique ...

Fixes #2

Refactored TranslationListener to be more readable and less prone to future errors.