Cache and bucket fixes