adjusted test cases, small bug fix in cache handling