Fixed cache issue due to conflicts
Merge branch 'master' of https://github.com/jklt/videolyrics-client