Fix a caching issue and udpdate TODOs