Revert "Now using WeakHashMap for cache"

This reverts commit c4fa13413f95d74a48b11353de61a42a30db9554.