Currently we have all the handlers in one file (including handlers that use the cache and ones that don't) - we should keep to that structure if possible. Maybe that implies moving it out of the cache/ directory.