Restructured cache and services to use actual cache