refactor: reduce usage of ForkStorage outside inner module (#539)

refactor: reduce usage of ForkStorage outside inner module (#539) #1472