Updated usage of cache system. See #2.