#35 - Switch to Spring Data KeyValue.