Metadata out of sync

[wishie]

I suspect, due to ExoPlayer2 buffering the audio part of the stream, I find that the metadata updates come at a different time to the song change.. around 4-5 seconds (which Is why I think audio buffer).. since some of the audio files on my radio station are short intro's/drops/id's etc, do you think there is a way to attempt to keep the metadata updates in sync with the audio stream, based off the amount of data in the buffer?