Update cache defs
Fix date constraint