Added tests for cached indicators
Fix indexed cache