Cache class and gettext library fixed