* Implement initial fix * Revert "Implement initial fix" This reverts commit 05e5803ebaa6330979e9a4ff6a4b343e74957ca0. * Don't remove null cache values, they can always get removed when clearing cache
* Implement initial fix * Revert "Implement initial fix" This reverts commit 05e5803ebaa6330979e9a4ff6a4b343e74957ca0. * Don't remove null cache values, they can always get removed when clearing cache