improve cache management
improve translation