improved uniform cache handling