Various updates to cache listeners