Cache: Fix international characters issue