working cache for 3.0.0
added checks for disabled cache