updated var names for cache class