Calculating the hopping rate for self-diffusion on rough potential energy surfaces: Cage correlations