Migrate TreeMap to use RideCache

.. and therefore also using the Specification approach.