Cache issue + gallery bug