Improve readability of cache class