- Added function-based matching. - Currently everything should be cached, except for things where function matching occurs. (may need some expansion) - Should address Issue #36