Partial port of albumArtCache and some fixes