Refactored the package to support the future cache PSR.
Updated router for cache changes.
Type checker fixes.
Quick changes.