Get rid of those listens so they don't sit around forever on the cache object.
Remove disabled code.
0.9.0
0.9.1