Revert "removing cache since it caches for 10 years currently" in favor of custom handler

This reverts commit 0e6dee0a404771af3a0e978a289694d47f0b2629.