Andrew and I did some pair programming and I think we figured out how to remove all of the BoundedHashMap's:

https://github.com/pwendell/spark/commit/dc42db62426fddc8cbe961d9c2b3af1bf1ad14c5