Version 3

Improve caching logic of #1 (#3)

* Improve caching logic of #1

Uses a single step instead of two seperate steps, as it is less bugprone

* Update as requested and suggested by @mymindstorm