changed: Modify rate calculation to obtain a proper average with heavy seeking/cache swapping
changed: Don't perform wait-on-data if position is in our old cache
Merge pull request #5808 from arnova/average_fix