re #91 : Performance optimisations

- Prevent key regeneration
- Prevent translation re-lookup.