Cahcing for custom endpoint.  Restructuring a little.