Fix setters and getters; memoize the map