Fixed issue #10: Tracking not properly working with active cache