Fixing a problem with expirty cacheing