Changing cache expiry to 15mins also some housekeeping