Fix #135 Bug: Hangs up on cached action