Nix flakes eval cache not working as expected

I know this was previously mentioned in Missing clarity around when nix caches evaluation for local filesystem flakes · Issue #10437 · NixOS/nix · GitHub, but has the situation changed since then?

My personal workflow is that sometimes, I need to tweak my machine configuration files and fire a rebuild to test them. But now everytime I rebuild the configuration I need to wait 20 seconds to re-eval nixpkgs, because either the git commit hash changed, or working dir is dirty, which to my understanding will invalidate previous flake eval caches.

Is there any way to work this around, for example, reuse the eval cache, at least for flake inputs?