FIX cache not save