Image cache improved