Fixed cache issues.
Fixed air-by-date issues