Cache Coordinate parsing correction. Fixes #2499 #2500

Fixes #2499 #2500