Better cache types and added tests for getting cached values