All occurrences have been replaced now. Leaving this open until we do a performance comparison between the default computing cache vs reentrant computing cache.