further improved caching, removed locale switch because of to much side-effects