Updated caching to not include map function

Caching is now just a weak referenced cache, so it's only serving a
single purpose