No, there is not. We've chosen to buffer things in a way that improves battery life for those who listen without skipping a whole bunch (since doing that will hurt battery life even if we added a method to prebuffer a tiny bit of more songs, and that method would hurt battery life for those not skipping around a bunch).
It'll only happen if you skip tracks frequently, so the best plan is to put a little preparation into your playlists so you don't need to, or just have a little patience when it happens.