I say you can always go to Japan, and it will be Japan. Cuba OTO may change dramatically, or your ability to visit it may be even further curtailed by the government. (Don't get me started on the "land of the free", except, unless, but...).

Or Cuba may become suddenly "open" to the US. Given our close proximity it won't take long for us to wreck it.