Fix newly added and/or updated options not being immediately available in cache