another attempt at cache fix